Fix netstumbler, position filter for NEWQ. Only stackfilter (which will

be messy) remains.

diff --git a/gpsbabel/netstumbler.cc b/gpsbabel/netstumbler.cc
index a1ece31428770899ba11fec84abc9e5d9b29c821..af11c50603efd9b3b04421897601bce984e8c23a 100644 (file)
--- a/gpsbabel/netstumbler.cc
+++ b/gpsbabel/netstumbler.cc
@@ -300,10 +300,9 @@ fix_netstumbler_dupes(void)
 #if NEWQ
   // Why, oh, why is this format running over the entire waypoint list and
   // modifying it?  This seems wrong.
-//  extern QList<Waypoint*> waypt_list;
-//  foreach(Waypoint* waypointp, waypt_list) {
-//    bh->wpt = waypointp;
-  if (false) {
+  extern QList<Waypoint*> waypt_list;
+  foreach(Waypoint* waypointp, waypt_list) {
+    bh->wpt = waypointp;
 #else
   queue* elem, *tmp;
   extern queue waypt_head;

diff --git a/gpsbabel/position.cc b/gpsbabel/position.cc
index 998c1f43e0eeea8128d2d7d010e338e877436a48..3af01914dafe6dd20751353868a4c0b5f471c84a 100644 (file)
--- a/gpsbabel/position.cc
+++ b/gpsbabel/position.cc
@@ -85,8 +85,13 @@ position_runqueue(queue* q, int nelems, int qtype)
   comp = (Waypoint**) xcalloc(nelems, sizeof(*comp));
   qlist = (int*) xcalloc(nelems, sizeof(*qlist));
 
+#if NEWQ
+  foreach(Waypoint* waypointp, waypt_list) {
+    comp[i] = waypointp;
+#else
   QUEUE_FOR_EACH(q, elem, tmp) {
     comp[i] = (Waypoint*)elem;
+#endif
     qlist[i] = 0;
     i++;
   }